Merge branch '[email protected]' of git://git.denx.de/u-boot-staging
authorTom Rini <[email protected]>
Mon, 19 Nov 2012 16:27:18 +0000 (09:27 -0700)
committerTom Rini <[email protected]>
Mon, 19 Nov 2012 16:27:18 +0000 (09:27 -0700)

Trivial merge